From cde06494f841a896b01cb73f428bf657b5d0e257 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 19 Apr 2019 17:11:30 +0000
Subject: [PATCH] Various item and skill changes. Contributed by Liamxroy.

---
 .../game/data/stats/skills/10700-10799.xml    |   1 -
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/skills/10700-10799.xml    |   1 -
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/items/28300-28399.xml     |   5 +
 .../game/data/stats/skills/10700-10799.xml    |   1 -
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/items/28300-28399.xml     |   5 +
 .../game/data/stats/items/28400-28499.xml     |   4 +
 .../game/data/stats/skills/10700-10799.xml    |   1 -
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/items/28300-28399.xml     |  15 +
 .../game/data/stats/items/28400-28499.xml     |   4 +
 .../game/data/stats/skills/10700-10799.xml    |   5 +-
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/items/28300-28399.xml     |  15 +
 .../game/data/stats/items/28400-28499.xml     |   4 +
 .../game/data/stats/skills/10700-10799.xml    |   5 +-
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/items/28300-28399.xml     |  15 +
 .../game/data/stats/items/28400-28499.xml     |   8 +
 .../game/data/stats/items/80100-80199.xml     |  20 +
 .../game/data/stats/items/80200-80299.xml     |  98 ++
 .../game/data/stats/skills/10000-10099.xml    | 111 ++-
 .../game/data/stats/skills/10700-10799.xml    |   5 +-
 .../game/data/stats/skills/11700-11799.xml    |   3 +
 .../game/data/stats/skills/19500-19599.xml    | 902 +++++++++++++++++-
 .../game/data/stats/skills/23300-23399.xml    |  11 +
 .../game/data/stats/skills/35100-35199.xml    |  93 +-
 35 files changed, 1291 insertions(+), 125 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml
index ed45679d2f..8aa5bde35c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml
@@ -1059,7 +1059,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml
index d992f14b5a..0e9a2d4495 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11700-11799.xml
@@ -1454,6 +1454,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml
index 580975007f..c2371926f5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml
index dab9cb5bda..b2d8239287 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml
@@ -1109,7 +1109,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml
index 7345524bac..a15e42f244 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11700-11799.xml
@@ -1576,6 +1576,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23300-23399.xml
index 75682c7243..9fc4cfc258 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28300-28399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28300-28399.xml
index cb910aa16a..31c2a2ea4c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28300-28399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/28300-28399.xml
@@ -932,6 +932,11 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="300" max="300" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="300" max="300" chance="100" /> <!-- Fishing Shots -->
+		</capsuled_items>
 	</item>
 	<item id="28396" name="Heine Exclusive Fishing Tools - 3,000 Pack" type="EtcItem">
 		<!-- Double-click to get 3,000 Heine Exclusive Bait Coupons, 3,000 Fishing Shots, and 1 Fishing Rod Pack (30-day). -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml
index 9770b2f29c..50eadcd5c6 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml
@@ -1094,7 +1094,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml
index be31a3b2d5..6c635667a3 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11700-11799.xml
@@ -1576,6 +1576,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23300-23399.xml
index 25ad6b3292..7f0e920e93 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28300-28399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28300-28399.xml
index 32b702a669..e0081553f8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28300-28399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28300-28399.xml
@@ -940,6 +940,11 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="300" max="300" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="300" max="300" chance="100" /> <!-- Fishing Shots -->
+		</capsuled_items>
 	</item>
 	<item id="28396" name="Heine Exclusive Fishing Tools - 3,000 Pack" type="EtcItem">
 		<!-- Double-click to get 3,000 Heine Exclusive Bait Coupons, 3,000 Fishing Shots, and 1 Fishing Rod Pack (30-day). -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml
index 1445ff4ded..1043dd3521 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/28400-28499.xml
@@ -260,6 +260,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="23873" min="1" max="1" chance="100" /> <!-- High-grade Maphr's Rune 100% (7-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28498" name="Royal Red Save Card (R99-grade)" additionalName="Event" type="EtcItem">
 		<!-- When using an R99-grade Weapon Enchantment Standard Weapon Enchant Scroll, increases the chance by 10%. Can only be used with 7 to 11 Enchantment Item. On success, Enchantment count increases by 1 to 3. In case of Enchantment failure, the item is not Crystallized, but the base Enchantment count decreases by 1. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml
index 633aa0f27a..236547066a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10700-10799.xml
@@ -1122,7 +1122,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml
index bb82d97dc6..80f552f8fa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml
@@ -1506,6 +1506,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml
index 7552d0719e..2dcd7652b9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28300-28399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28300-28399.xml
index 7d7fb876f0..60914d1b4a 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28300-28399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28300-28399.xml
@@ -824,6 +824,10 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28386" min="1" max="1" chance="100" /> <!-- Race Change Ticket -->
+		</capsuled_items>
 	</item>
 	<item id="28386" name="Race Change Ticket" type="EtcItem">
 		<!-- After purchasing a Race Change ticket, you can contact support at, support.lineage2.com, with the subject title of "Character Race Change". \Only characters that have reached at least level 85 and who have completed the 4th Class transfer can request a race change. Note that the following race and class restrictions apply to the race change service. 1.) Ertheia and Kamael classes cannot change to a different race. 2.) Human/ Elf/ Dark Elf/ Orc/ Dwarf races cannot change to the Ertheia or Kamael race. 3.) Orc Overlord/ Dominator/ Iss Dominator as a Mainclass/ Dualclass/ Sublcass cannot change to a different race. 4.) Dwarven Warsmith/ Maestro/ Tyrr Maestro as a Mainclass/ Dualclass/ Sublcass cannot change to a different race. 5.) If switching from a Dwarven race to Human/ Elf/ Dark Elf/ Orc, the character will lose the Dwarven inventory/ warehouse/ private shop bonus slots. -->
@@ -940,6 +944,11 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="300" max="300" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="300" max="300" chance="100" /> <!-- Fishing Shots -->
+		</capsuled_items>
 	</item>
 	<item id="28396" name="Heine Exclusive Fishing Tools - 3,000 Pack" type="EtcItem">
 		<!-- Double-click to get 3,000 Heine Exclusive Bait Coupons, 3,000 Fishing Shots, and 1 Fishing Rod Pack (30-day). -->
@@ -948,6 +957,12 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="3000" max="3000" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="3000" max="3000" chance="100" /> <!-- Fishing Shots -->
+			<item id="45493" min="1" max="1" chance="100" /> <!-- Fishing Rod Pack (30-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28397" name="2016 World Olympiad Hero XXX's Accessory" type="Armor">
 		<!-- Special hair accessory crafted for the winner of the 2016 World Olympiad, XXX. STR/ INT/ DEX/ WIT/ CON/ MEN +5 when equipped. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28400-28499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28400-28499.xml
index db6b75b695..e1096c199e 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28400-28499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/28400-28499.xml
@@ -260,6 +260,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="23873" min="1" max="1" chance="100" /> <!-- High-grade Maphr's Rune 100% (7-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28498" name="Royal Red Save Card (R99-grade)" additionalName="Event" type="EtcItem">
 		<!-- When using an R99-grade Weapon Enchantment Standard Weapon Enchant Scroll, increases the chance by 10%. Can only be used with 7 to 11 Enchantment Item. On success, Enchantment count increases by 1 to 3. In case of Enchantment failure, the item is not Crystallized, but the base Enchantment count decreases by 1. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
index ebe84d5e1b..2e7bb94680 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
@@ -1114,10 +1114,8 @@
 		</effectPoint>
 		<reuseDelay>7000</reuseDelay>
 		<targetType>ENEMY</targetType>
-		<affectScope>SQUARE</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
-		<fanRange>0;0;1100;50</fanRange>
-		<affectLimit>5-12</affectLimit>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1128,7 +1126,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml
index 8a2a8e246a..74dd6a45d7 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11700-11799.xml
@@ -1494,6 +1494,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/23300-23399.xml
index 7ae03c83e5..342d65718c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28300-28399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28300-28399.xml
index 6dfb6787d8..e59b1aa260 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28300-28399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28300-28399.xml
@@ -824,6 +824,10 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28386" min="1" max="1" chance="100" /> <!-- Race Change Ticket -->
+		</capsuled_items>
 	</item>
 	<item id="28386" name="Race Change Ticket" type="EtcItem">
 		<!-- After purchasing a Race Change ticket, you can contact support at, support.lineage2.com, with the subject title of "Character Race Change". \Only characters that have reached at least level 85 and who have completed the 4th Class transfer can request a race change. Note that the following race and class restrictions apply to the race change service. 1.) Ertheia and Kamael classes cannot change to a different race. 2.) Human/ Elf/ Dark Elf/ Orc/ Dwarf races cannot change to the Ertheia or Kamael race. 3.) Orc Overlord/ Dominator/ Iss Dominator as a Mainclass/ Dualclass/ Sublcass cannot change to a different race. 4.) Dwarven Warsmith/ Maestro/ Tyrr Maestro as a Mainclass/ Dualclass/ Sublcass cannot change to a different race. 5.) If switching from a Dwarven race to Human/ Elf/ Dark Elf/ Orc, the character will lose the Dwarven inventory/ warehouse/ private shop bonus slots. -->
@@ -940,6 +944,11 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="300" max="300" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="300" max="300" chance="100" /> <!-- Fishing Shots -->
+		</capsuled_items>
 	</item>
 	<item id="28396" name="Heine Exclusive Fishing Tools - 3,000 Pack" type="EtcItem">
 		<!-- Double-click to get 3,000 Heine Exclusive Bait Coupons, 3,000 Fishing Shots, and 1 Fishing Rod Pack (30-day). -->
@@ -948,6 +957,12 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="3000" max="3000" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="3000" max="3000" chance="100" /> <!-- Fishing Shots -->
+			<item id="45493" min="1" max="1" chance="100" /> <!-- Fishing Rod Pack (30-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28397" name="2016 World Olympiad Hero XXX's Accessory" type="Armor">
 		<!-- Special hair accessory crafted for the winner of the 2016 World Olympiad, XXX. STR/ INT/ DEX/ WIT/ CON/ MEN +5 when equipped. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28400-28499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28400-28499.xml
index 8000ff66dc..73b38cd15e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28400-28499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/28400-28499.xml
@@ -260,6 +260,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="23873" min="1" max="1" chance="100" /> <!-- High-grade Maphr's Rune 100% (7-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28498" name="Royal Red Save Card (R99-grade)" additionalName="Event" type="EtcItem">
 		<!-- When using an R99-grade Weapon Enchantment Standard Weapon Enchant Scroll, increases the chance by 10%. Can only be used with 7 to 11 Enchantment Item. On success, Enchantment count increases by 1 to 3. In case of Enchantment failure, the item is not Crystallized, but the base Enchantment count decreases by 1. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
index 2e9952a43e..54a641361f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
@@ -1106,10 +1106,8 @@
 		</effectPoint>
 		<reuseDelay>7000</reuseDelay>
 		<targetType>ENEMY</targetType>
-		<affectScope>SQUARE</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
-		<fanRange>0;0;1100;50</fanRange>
-		<affectLimit>5-12</affectLimit>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1120,7 +1118,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml
index 543b1381ec..0c26506b57 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml
@@ -1478,6 +1478,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml
index 294e6d3456..b2fce62f9b 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28300-28399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28300-28399.xml
index 769dd84f0b..ffda362252 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28300-28399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28300-28399.xml
@@ -827,6 +827,10 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
 		<set name="is_freightable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28386" min="1" max="1" chance="100" /> <!-- Race Change Ticket -->
+		</capsuled_items>
 	</item>
 	<item id="28386" name="Race Change Ticket" type="EtcItem">
 		<!-- After purchasing a Race Change ticket, you can contact support at, support.lineage2.com, with the subject title of "Character Race Change". \Only characters that have reached at least level 85 and who have completed the 4th Class transfer can request a race change. Note that the following race and class restrictions apply to the race change service. 1.) Ertheia and Kamael classes cannot change to a different race. 2.) Human/ Elf/ Dark Elf/ Orc/ Dwarf races cannot change to the Ertheia or Kamael race. 3.) Orc Overlord/ Dominator/ Iss Dominator as a Mainclass/ Dualclass/ Sublcass cannot change to a different race. 4.) Dwarven Warsmith/ Maestro/ Tyrr Maestro as a Mainclass/ Dualclass/ Sublcass cannot change to a different race. 5.) If switching from a Dwarven race to Human/ Elf/ Dark Elf/ Orc, the character will lose the Dwarven inventory/ warehouse/ private shop bonus slots. -->
@@ -943,6 +947,11 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="300" max="300" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="300" max="300" chance="100" /> <!-- Fishing Shots -->
+		</capsuled_items>
 	</item>
 	<item id="28396" name="Heine Exclusive Fishing Tools - 3,000 Pack" type="EtcItem">
 		<!-- Double-click to get 3,000 Heine Exclusive Bait Coupons, 3,000 Fishing Shots, and 1 Fishing Rod Pack (30-day). -->
@@ -951,6 +960,12 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="28393" min="3000" max="3000" chance="100" /> <!-- Heine Exclusive Bait Coupons -->
+			<item id="38154" min="3000" max="3000" chance="100" /> <!-- Fishing Shots -->
+			<item id="45493" min="1" max="1" chance="100" /> <!-- Fishing Rod Pack (30-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28397" name="2016 World Olympiad Hero XXX's Accessory" type="Armor">
 		<!-- Special hair accessory crafted for the winner of the 2016 World Olympiad, XXX. STR/ INT/ DEX/ WIT/ CON/ MEN +5 when equipped. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28400-28499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28400-28499.xml
index e474011ead..3423ec5291 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28400-28499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/28400-28499.xml
@@ -260,6 +260,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="23873" min="1" max="1" chance="100" /> <!-- High-grade Maphr's Rune 100% (7-day) -->
+		</capsuled_items>
 	</item>
 	<item id="28498" name="Royal Red Save Card (R99-grade)" additionalName="Event" type="EtcItem">
 		<!-- When using an R99-grade Weapon Enchantment Standard Weapon Enchant Scroll, increases the chance by 10%. Can only be used with 7 to 11 Enchantment Item. On success, Enchantment count increases by 1 to 3. In case of Enchantment failure, the item is not Crystallized, but the base Enchantment count decreases by 1. -->
@@ -292,6 +296,10 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="37718" min="1" max="1" minEnchant="10" maxEnchant="10" chance="100" /> <!-- Shiny Elemental Shirt -->
+		</capsuled_items>
 	</item>
 	<item id="28413" name="+10 Reflect Attack T-shirt Pack" type="EtcItem">
 		<!-- Wrapped Pack containing a +10 Reflect Attack T-shirt. The shirt acquired after opening the box cannot be dropped or exchanged. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80100-80199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80100-80199.xml
index cd186edfd3..c8d0bc6824 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80100-80199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80100-80199.xml
@@ -2198,7 +2198,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">179</stat>
 		</stats>
@@ -2214,7 +2216,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="7520" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 			<skill id="13310" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Heavy Armor Top Special Ability -->
@@ -2233,7 +2237,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="3170" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">299</stat>
 		</stats>
@@ -2248,6 +2254,7 @@
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">119</stat>
 		</stats>
@@ -2262,6 +2269,8 @@
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
+		<set name="isAppearanceable" val="true" />
 		<stats>
 			<stat type="pDef">119</stat>
 		</stats>
@@ -2279,6 +2288,7 @@
 		<set name="enchant_enabled" val="1" />
 		<set name="isAppearanceable" val="true" />
 		<set name="immediate_effect" val="true" />
+		<set name="element_enabled" val="true" />
 		<set name="commissionItemType" val="SHIELD" />
 		<skills>
 			<skill id="35294" level="1" type="ON_ENCHANT" type_value="4" /> <!-- Leviathan Shield Enchantment Effect -->
@@ -2300,6 +2310,8 @@
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">179</stat>
 		</stats>
@@ -2316,6 +2328,8 @@
 		<set name="weight" val="4140" />
 		<set name="price" val="1055730000" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 			<skill id="13311" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Light Armor Top Special Ability -->
@@ -2336,6 +2350,8 @@
 		<set name="weight" val="1320" />
 		<set name="price" val="659832500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">239</stat>
 			<stat type="rEvas">3</stat>
@@ -2351,6 +2367,8 @@
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">119</stat>
 		</stats>
@@ -2365,6 +2383,8 @@
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">119</stat>
 		</stats>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80200-80299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80200-80299.xml
index def91e004b..bb04cfcaf2 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80200-80299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/80200-80299.xml
@@ -9,7 +9,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">179</stat>
 		</stats>
@@ -25,7 +27,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="1750" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 			<skill id="13312" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Robe Upper Special Ability -->
@@ -46,7 +50,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="850" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="mDef">43</stat>
 			<stat type="pDef">164</stat>
@@ -62,7 +68,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">119</stat>
 		</stats>
@@ -76,7 +84,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">119</stat>
 		</stats>
@@ -91,7 +101,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<set name="blessed" val="true" />
 		<set name="crystal_count" val="8393" />
 		<skills>
@@ -113,7 +125,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="7520" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<set name="blessed" val="true" />
 		<set name="crystal_count" val="3378" />
 		<skills>
@@ -137,7 +151,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="3170" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<set name="blessed" val="true" />
 		<set name="crystal_count" val="3378" />
 		<skills>
@@ -158,7 +174,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<set name="blessed" val="true" />
 		<set name="crystal_count" val="3378" />
 		<skills>
@@ -179,7 +197,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<set name="blessed" val="true" />
 		<set name="crystal_count" val="3378" />
 		<skills>
@@ -200,7 +220,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">186</stat>
 		</stats>
@@ -216,7 +238,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="4140" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 			<skill id="13311" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Light Armor Top Special Ability -->
@@ -239,7 +263,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="1320" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8841" level="1" /> <!-- PvE Defense -->
 			<skill id="13808" level="1" /> <!-- Additional Ability Might -->
@@ -259,7 +285,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8841" level="1" /> <!-- PvE Defense -->
 			<skill id="13809" level="1" /> <!-- Additional Ability Might -->
@@ -278,7 +306,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8843" level="1" /> <!-- PvE Defense -->
 			<skill id="13810" level="1" /> <!-- Additional Ability Might -->
@@ -297,7 +327,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8844" level="1" /> <!-- PvE Defense -->
 			<skill id="13811" level="1" /> <!-- Additional Ability Might -->
@@ -317,7 +349,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="1750" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 			<skill id="13312" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Robe Upper Special Ability -->
@@ -341,7 +375,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="850" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8846" level="1" /> <!-- PvE Defense -->
 			<skill id="13813" level="1" /> <!-- Additional Ability Might -->
@@ -362,7 +398,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8847" level="1" /> <!-- PvE Defense -->
 			<skill id="13814" level="1" /> <!-- Additional Ability Might -->
@@ -381,7 +419,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8848" level="1" /> <!-- PvE Defense -->
 			<skill id="13815" level="1" /> <!-- Additional Ability Might -->
@@ -400,7 +440,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8805" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -419,7 +461,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="7520" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 			<skill id="8806" level="1" /> <!-- PvP Defense -->
@@ -439,7 +483,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="3170" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8807" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -457,7 +503,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8808" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -475,7 +523,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8809" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -493,7 +543,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8810" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -512,7 +564,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="4140" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8811" level="1" /> <!-- PvP Defense -->
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
@@ -533,7 +587,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="1320" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8812" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -552,7 +608,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8813" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -570,7 +628,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8814" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -588,7 +648,9 @@
 		<set name="material" val="BONE" />
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8815" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -607,7 +669,9 @@
 		<set name="material" val="BRONZE" />
 		<set name="weight" val="1750" />
 		<set name="price" val="1055730000" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8816" level="1" /> <!-- PvP Defense -->
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
@@ -629,7 +693,9 @@
 		<set name="material" val="SCALE_OF_DRAGON" />
 		<set name="weight" val="850" />
 		<set name="price" val="659832500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8817" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -649,7 +715,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8818" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -667,7 +735,9 @@
 		<set name="material" val="LEATHER" />
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
+		<set name="isAppearanceable" val="true" />
 		<set name="enchant_enabled" val="1" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="8819" level="1" /> <!-- PvP Defense -->
 		</skills>
@@ -686,6 +756,8 @@
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">198</stat>
 		</stats>
@@ -702,6 +774,8 @@
 		<set name="weight" val="7520" />
 		<set name="price" val="1055730000" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 		</skills>
@@ -721,6 +795,8 @@
 		<set name="weight" val="3170" />
 		<set name="price" val="659832500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">330</stat>
 		</stats>
@@ -751,6 +827,8 @@
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">132</stat>
 		</stats>
@@ -766,6 +844,8 @@
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">198</stat>
 		</stats>
@@ -782,6 +862,8 @@
 		<set name="weight" val="4140" />
 		<set name="price" val="1055730000" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 		</skills>
@@ -802,6 +884,8 @@
 		<set name="weight" val="1320" />
 		<set name="price" val="659832500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">264</stat>
 			<stat type="rEvas">3</stat>
@@ -818,6 +902,8 @@
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">132</stat>
 		</stats>
@@ -833,6 +919,8 @@
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">132</stat>
 		</stats>
@@ -848,6 +936,8 @@
 		<set name="weight" val="530" />
 		<set name="price" val="395897500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">198</stat>
 		</stats>
@@ -864,6 +954,8 @@
 		<set name="weight" val="1750" />
 		<set name="price" val="1055730000" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<skills>
 			<skill id="13063" level="1" /> <!-- Cloak Slot Activation (R-grade) -->
 		</skills>
@@ -885,6 +977,8 @@
 		<set name="weight" val="850" />
 		<set name="price" val="659832500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="mDef">49</stat>
 			<stat type="pDef">181</stat>
@@ -902,6 +996,8 @@
 		<set name="weight" val="510" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">132</stat>
 		</stats>
@@ -917,6 +1013,8 @@
 		<set name="weight" val="1070" />
 		<set name="price" val="263932500" />
 		<set name="enchant_enabled" val="1" />
+		<set name="isAppearanceable" val="true" />
+		<set name="element_enabled" val="true" />
 		<stats>
 			<stat type="pDef">132</stat>
 		</stats>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
index e0c1d6be27..ed77fd5870 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml
@@ -423,7 +423,7 @@
 		<!-- Uses a shield to rush target with $s1 Power added, reducing their Speed by $s3 for $s2. Can be used while a shield is equipped. -->
 		<icon>icon.skill10008</icon>
 		<activateRate>
-			<value fromLevel="1" toLevel="13">80</value>
+			<value fromLevel="1" toLevel="13">90</value>
 			<value fromLevel="7" toLevel="13" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
 		</activateRate>
 		<abnormalLvl>
@@ -441,10 +441,9 @@
 			<value level="12">3</value>
 			<value level="13">3</value>
 		</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
+		<abnormalTime>3</abnormalTime>
 		<abnormalType>SHIELD_ATTACK</abnormalType>
-		<affectHeight>-100;200</affectHeight>
-		<operateType>A2</operateType>
+		<operateType>DA2</operateType>
 		<mpConsume>
 			<value level="1">53</value>
 			<value level="2">54</value>
@@ -462,7 +461,7 @@
 		</mpConsume>
 		<magicCriticalRate>5</magicCriticalRate>
 		<nextAction>ATTACK</nextAction>
-		<castRange>40</castRange>
+		<castRange>300</castRange>
 		<hitTime>800</hitTime>
 		<coolTime>570</coolTime>
 		<magicLvl>
@@ -480,12 +479,11 @@
 			<value level="12">107</value>
 			<value level="13">109</value>
 		</magicLvl>
-		<reuseDelay>5000</reuseDelay>
+		<reuseDelay>10000</reuseDelay>
 		<isDebuff>true</isDebuff>
-		<basicProperty>NONE</basicProperty>
+		<basicProperty>PHYSICAL</basicProperty>
 		<hitCancelTime>0</hitCancelTime>
-		<effectRange>400</effectRange>
-		<irreplacableBuff>true</irreplacableBuff>
+		<effectRange>300</effectRange>
 		<effectPoint>
 			<value level="1">-689</value>
 			<value level="2">-692</value>
@@ -503,8 +501,12 @@
 		</effectPoint>
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<isDebuff>true</isDebuff>
 		<conditions>
 			<condition name="EquipShield" />
+			<condition name="OpCheckCastRange">
+				<distance>300</distance>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="AirBind" />
@@ -526,27 +528,13 @@
 					<value fromLevel="7" toLevel="13" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
 				</power>
 			</effect>
-			<effect name="PhysicalDefence">
-				<amount>-10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="PhysicalEvasion">
-				<amount>-2</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="DefenceCriticalDamage">
-				<amount>-10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="Speed" fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">
+			<effect name="Speed">
 				<amount>
+					<value fromLevel="1" toLevel="6">120</value>
 					<value fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">{-2 * subIndex}</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="DispelCaster">
-				<dispel>SIGEL_SHIELD</dispel>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="10009" toLevel="13" name="Shield Bash">
@@ -793,13 +781,6 @@
 		<!-- With the wave of the shield, attacks enemies in front with $s1 Power added to P. Atk., pushes them away a short distance, and releases the target with a certain probability. Requires a shield to be equipped. -->
 		<icon>icon.skill10012</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>5</abnormalTime>
-		<abnormalType>STUN</abnormalType>
-		<abnormalVisualEffect>STUN</abnormalVisualEffect>
-		<activateRate>
-			<value fromLevel="1" toLevel="10">90</value>
-			<value fromLevel="4" toLevel="10" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
-		</activateRate>
 		<affectLimit>5-12</affectLimit>
 		<fanRange>0;0;150;180</fanRange>
 		<lvlBonusRate>30</lvlBonusRate>
@@ -816,7 +797,6 @@
 			<value level="9">107</value>
 			<value level="10">109</value>
 		</magicLvl>
-		<trait>SHOCK</trait>
 		<operateType>A2</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>
@@ -850,9 +830,11 @@
 		</effectPoint>
 		<hitCancelTime>0</hitCancelTime>
 		<isDebuff>true</isDebuff>
-		<targetType>ENEMY</targetType>
-		<affectScope>SINGLE</affectScope>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>FAN</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
+		<trait>DERANGEMENT</trait>
+		<nextAction>ATTACK</nextAction>
 		<conditions>
 			<condition name="EquipShield" />
 		</conditions>
@@ -882,6 +864,14 @@
 				</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="KnockBack">
+				<speed>700</speed>
+				<distance>50</distance>
+				<knockDown>false</knockDown>
+			</effect>
+			<effect name="DeleteHate">
+				<chance>40</chance>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10012" toLevel="12" name="Shield Wave">
@@ -989,9 +979,12 @@
 		</effects>
 	</skill>
 	<skill id="10013" toLevel="13" name="Rising Smash">
-		<!-- Attacks nearby targets with $s1 Power added to P. Atk. and Received Healing -$s3 for $s2 Can be used while a sword or blunt weapon is equipped. Over-hit. Critical. -->
+		<!-- Attacks nearby targets with 22033 Power added to P. Atk. and Received Healing -90% for 5 sec. Can be used while a sword or blunt weapon is equipped. Over-hit. Critical. -->
 		<icon>icon.skill10013</icon>
 		<affectLimit>5-12</affectLimit>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>5</abnormalTime>
+		<abnormalType>HEAL_EFFECT_DOWN</abnormalType>
 		<affectRange>200</affectRange>
 		<affectHeight>-100;200</affectHeight>
 		<lvlBonusRate>2</lvlBonusRate>
@@ -1063,6 +1056,10 @@
 			</condition>
 		</conditions>
 		<effects>
+			<effect name="HealEffect">
+				<amount>-90</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">10314</value>
@@ -1093,11 +1090,12 @@
 		</effects>
 	</skill>
 	<skill id="10014" toLevel="13" name="Chain Gust">
-		<!-- Swings the chain to attack nearby enemies with $s1 Power added to P. Atk. and holds them for $s2. Requires a sword or blunt weapon to be equipped. Over-hit. Critical. -->
+		<!-- Swings the chain to attack nearby enemies with 28182 Power added to P. Atk. and holds them for 5 sec. Requires a sword or blunt weapon to be equipped. Over-hit. Critical. -->
 		<icon>icon.skill10014</icon>
-		<abnormalLvl>3</abnormalLvl>
+		<abnormalLvl>5</abnormalLvl>
 		<abnormalTime>5</abnormalTime>
-		<abnormalType>HEAL_EFFECT_DOWN</abnormalType>
+		<abnormalType>STUN</abnormalType>
+		<activateRate>90</activateRate>
 		<activateRate>
 			<value fromLevel="1" toLevel="13">80</value>
 			<value fromLevel="7" toLevel="13" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
@@ -1105,8 +1103,10 @@
 		<affectLimit>5-12</affectLimit>
 		<affectRange>200</affectRange>
 		<lvlBonusRate>2</lvlBonusRate>
-		<basicProperty>MAGIC</basicProperty>
+		<basicProperty>PHYSICAL</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<isDebuff>true</isDebuff>
 		<magicLvl>
 			<value level="1">85</value>
 			<value level="2">86</value>
@@ -1138,7 +1138,7 @@
 			<value level="12">214</value>
 			<value level="13">218</value>
 		</mpConsume>
-		<hitTime>1700</hitTime>
+		<hitTime>2500</hitTime>
 		<coolTime>370</coolTime>
 		<reuseDelay>10000</reuseDelay>
 		<effectPoint>
@@ -1162,7 +1162,21 @@
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
 		<effects>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">14300</value>
@@ -1182,10 +1196,6 @@
 				</power>
 				<criticalChance>5</criticalChance>
 			</effect>
-			<effect name="HealEffect">
-				<amount>-90</amount>
-				<mode>PER</mode>
-			</effect>
 			<effect name="PhysicalDefence" fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">
 				<amount>
 					<value fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">{-0.6 - 0.4 * subIndex}</value>
@@ -1543,8 +1553,8 @@
 		<affectRange>1000</affectRange>
 		<abnormalLvl>2</abnormalLvl>
 		<abnormalTime>
-			<value fromLevel="1" toLevel="5">15</value>
-			<value fromLevel="1" toLevel="5" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value>
+			<value fromLevel="1" toLevel="7">15</value>
+			<value fromLevel="1" toLevel="7" fromSubLevel="1001" toSubLevel="1020">{base + 0.5 * subIndex}</value>
 		</abnormalTime>
 		<abnormalType>TRANSFER_DAMAGE</abnormalType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1585,6 +1595,9 @@
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
 		<affectObject>FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipShield" />
+		</conditions>
 		<effects>
 			<effect name="TransferDamageToPlayer">
 				<amount>90</amount>
@@ -1631,8 +1644,10 @@
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="TrackLimitedSkill" />
 		</effects>
+		<endEffects>
+			<effect name="TrackLimitedSkill" />
+		</endEffects>
 	</skill>
 	<skill id="10020" toLevel="7" name="Focus Shield">
 		<!-- For $s1, activates the Shield Block buff. Increases M. Def. by $s2 and decreases chance of receiving M. Critical Hit by $s3. Using Shield Charge, Shield Bash or Shield Boomerang cancels the skill. Requires a shield to be equipped. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
index b8ce7d175c..a19f0b2a70 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
@@ -1158,10 +1158,8 @@
 		</effectPoint>
 		<reuseDelay>7000</reuseDelay>
 		<targetType>ENEMY</targetType>
-		<affectScope>SQUARE</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
-		<fanRange>0;0;1100;50</fanRange>
-		<affectLimit>5-12</affectLimit>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>
@@ -1172,7 +1170,6 @@
 			</condition>
 		</conditions>
 		<effects>
-			<effect name="AirBind" />
 			<effect name="PhysicalAttack">
 				<power>
 					<value level="1">20814</value>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml
index 1781abae95..cf713a3812 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml
@@ -1588,6 +1588,9 @@
 			<effect name="HealPercent">
 				<power>100</power>
 			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
 			<effect name="Cp">
 				<amount>20000</amount>
 				<mode>DIFF</mode>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
index 1354bc8217..809e997514 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
@@ -853,17 +853,259 @@
 	<skill id="19552" toLevel="11" name="Burning Chain Lash">
 		<!-- Wields the Burning Chain to draw nearby enemies with $s1 Power added to P. Atk. and draw them to you. Also puts them into the Ignite state for $s2. Requires a sword/ blunt weapon to be equipped. Over-hit. Critical. -->
 		<icon>icon.skill19556</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>5</abnormalTime>
+		<abnormalType>STUN</abnormalType>
+		<activateRate>90</activateRate>
+		<activateRate>80</activateRate>
+		<affectLimit>5-12</affectLimit>
+		<affectRange>200</affectRange>
+		<lvlBonusRate>2</lvlBonusRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">85</value>
+			<value level="2">86</value>
+			<value level="3">88</value>
+			<value level="4">90</value>
+			<value level="5">92</value>
+			<value level="6">94</value>
+			<value level="7">96</value>
+			<value level="8">98</value>
+			<value level="9">101</value>
+			<value level="10">103</value>
+			<value level="11">105</value>
+		</magicLvl>
+		<operateType>A2</operateType>
+		<mpConsume>
+			<value level="1">159</value>
+			<value level="2">162</value>
+			<value level="3">167</value>
+			<value level="4">173</value>
+			<value level="5">179</value>
+			<value level="6">184</value>
+			<value level="7">190</value>
+			<value level="8">196</value>
+			<value level="9">202</value>
+			<value level="10">206</value>
+			<value level="11">210</value>
+		</mpConsume>
+		<hitTime>2500</hitTime>
+		<coolTime>370</coolTime>
+		<reuseDelay>10000</reuseDelay>
+		<effectPoint>
+			<value level="1">-1378</value>
+			<value level="2">-1383</value>
+			<value level="3">-1392</value>
+			<value level="4">-1400</value>
+			<value level="5">-1407</value>
+			<value level="6">-1414</value>
+			<value level="7">-1420</value>
+			<value level="8">-1425</value>
+			<value level="9">-1430</value>
+			<value level="10">-1435</value>
+			<value level="11">-1440</value>
+		</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<affectHeight>-100;200</affectHeight>
+		<isDebuff>true</isDebuff>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+			<effect name="BlockActions">
+				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
+			</effect>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">14300</value>
+					<value level="2">14789</value>
+					<value level="3">15769</value>
+					<value level="4">16748</value>
+					<value level="5">17727</value>
+					<value level="6">18707</value>
+					<value level="7">19686</value>
+					<value level="8">20666</value>
+					<value level="9">23468</value>
+					<value level="10">24612</value>
+					<value level="11">25756</value>
+				</power>
+				<criticalChance>5</criticalChance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19553" toLevel="7" name="Revenging Thorn">
 		<!-- Shoots Revenging Thorns to draw nearby enemies with $s1 Power added to P. Atk. and draw them to you. Recovers $s2 HP and has longer range and stronger effect if cast with Lv. 5 Grand Fortress. Requires a sword/ blunt weapon to be equipped. Over-hit. Critical. -->
 		<icon>icon.skill19553</icon>
+		<affectLimit>5-12</affectLimit>
+		<abnormalTime>1</abnormalTime>
+		<abnormalLvl>1</abnormalLvl>
+		<activateRate>60</activateRate>
+		<affectRange>400</affectRange>
+		<affectLimit>10-10</affectLimit>
+		<basicProperty>NONE</basicProperty>
+		<effectPoint>
+			<value level="1">-4312</value>
+			<value level="2">-4427</value>
+			<value level="3">-4544</value>
+			<value level="4">-4661</value>
+			<value level="5">-4778</value>
+			<value level="6">-4895</value>
+			<value level="7">-5013</value>
+		</effectPoint>
+		<effectRange>400</effectRange>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">95</value>
+			<value level="2">98</value>
+			<value level="3">101</value>
+			<value level="4">103</value>
+			<value level="5">105</value>
+			<value level="6">107</value>
+			<value level="7">109</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">40</value>
+			<value level="2">44</value>
+			<value level="3">48</value>
+			<value level="4">51</value>
+			<value level="5">53</value>
+			<value level="6">55</value>
+			<value level="7">57</value>
+		</mpConsume>
 		<operateType>A1</operateType>
+		<reuseDelay>30000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<hitTime>1000</hitTime>
+		<isDebuff>true</isDebuff>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BLUNT</item>
+					<item>SWORD</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">34353</value>
+					<value level="2">35201</value>
+					<value level="3">36897</value>
+					<value level="4">38593</value>
+					<value level="5">40289</value>
+					<value level="6">42087</value>
+					<value level="7">43885</value>
+				</power>
+				<overHit>true</overHit>
+				<chance>90</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+		</effects>
+		<selfEffects>
+			<effect name="HealPercent">
+				<power>5</power>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19554" toLevel="7" name="Revenging Black Thorn">
 		<!-- Shoots Revenging Thorns to draw nearby enemies with $s1 Power added to P. Atk. and draw them to you. Recovers $s2 HP and has longer range and stronger effect if cast with Lv. 5 Grand Fortress. Requires a sword/ blunt weapon to be equipped. Over-hit. Critical. -->
 		<icon>icon.skill19553</icon>
+		<affectLimit>5-12</affectLimit>
+		<abnormalTime>1</abnormalTime>
+		<abnormalLvl>1</abnormalLvl>
+		<activateRate>60</activateRate>
+		<affectRange>400</affectRange>
+		<affectLimit>10-10</affectLimit>
+		<basicProperty>NONE</basicProperty>
+		<effectPoint>
+			<value level="1">-4312</value>
+			<value level="2">-4427</value>
+			<value level="3">-4544</value>
+			<value level="4">-4661</value>
+			<value level="5">-4778</value>
+			<value level="6">-4895</value>
+			<value level="7">-5013</value>
+		</effectPoint>
+		<effectRange>400</effectRange>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">95</value>
+			<value level="2">98</value>
+			<value level="3">101</value>
+			<value level="4">103</value>
+			<value level="5">105</value>
+			<value level="6">107</value>
+			<value level="7">109</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">40</value>
+			<value level="2">44</value>
+			<value level="3">48</value>
+			<value level="4">51</value>
+			<value level="5">53</value>
+			<value level="6">55</value>
+			<value level="7">57</value>
+		</mpConsume>
 		<operateType>A1</operateType>
+		<reuseDelay>30000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<hitTime>3500</hitTime>
+		<isDebuff>true</isDebuff>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BLUNT</item>
+					<item>SWORD</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">35222</value>
+					<value level="2">35826</value>
+					<value level="3">43471</value>
+					<value level="4">45591</value>
+					<value level="5">47711</value>
+					<value level="6">49958</value>
+					<value level="7">52205</value>
+				</power>
+				<overHit>true</overHit>
+				<chance>90</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+		</effects>
+		<selfEffects>
+			<effect name="HealPercent">
+				<power>50</power>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19555" toLevel="7" name="Maelstrom">
 		<!-- Creates a cyclone to draw nearby enemies with $s1 Power added to P. Atk. and draw them to you. Requires a sword/ blunt weapon to be equipped. Over-hit. Critical. -->
@@ -943,42 +1185,575 @@
 	<skill id="19556" toLevel="7" name="Inhale Soul">
 		<!-- Creates a pit of darkness to draw nearby enemies with $s1 Power added to P. Atk. and draw them to you. Requires a sword/ blunt weapon to be equipped. Over-hit. Critical. -->
 		<icon>icon.skill19555</icon>
-		<operateType>A1</operateType>
+		<affectLimit>5-12</affectLimit>
+		<affectRange>400</affectRange>
+		<lvlBonusRate>2</lvlBonusRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">95</value>
+			<value level="2">98</value>
+			<value level="3">101</value>
+			<value level="4">103</value>
+			<value level="5">105</value>
+			<value level="6">107</value>
+			<value level="7">109</value>
+		</magicLvl>
+		<operateType>A2</operateType>
+		<mpConsume>
+			<value level="1">40</value>
+			<value level="2">44</value>
+			<value level="3">48</value>
+			<value level="4">51</value>
+			<value level="5">53</value>
+			<value level="6">55</value>
+			<value level="7">57</value>
+		</mpConsume>
+		<hitTime>3500</hitTime>
+		<coolTime>370</coolTime>
+		<reuseDelay>30000</reuseDelay>
+		<effectPoint>
+			<value level="1">-1378</value>
+			<value level="2">-1383</value>
+			<value level="3">-1392</value>
+			<value level="4">-1400</value>
+			<value level="5">-1407</value>
+			<value level="6">-1414</value>
+			<value level="7">-1420</value>
+		</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<affectHeight>-100;200</affectHeight>
+		<isDebuff>true</isDebuff>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<abnormalTime>5</abnormalTime>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">35222</value>
+					<value level="2">38826</value>
+					<value level="3">43471</value>
+					<value level="4">45591</value>
+					<value level="5">47711</value>
+					<value level="6">49958</value>
+					<value level="7">52205</value>
+				</power>
+				<criticalChance>5</criticalChance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19557" toLevel="5" name="Inhale Soul">
 		<!-- Creates a pit of darkness to draw nearby enemies to you. Requires a sword/ blunt weapon to be equipped. -->
 		<icon>icon.skill19555</icon>
-		<operateType>A1</operateType>
+		<affectLimit>5-12</affectLimit>
+		<affectRange>400</affectRange>
+		<lvlBonusRate>2</lvlBonusRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">95</value>
+			<value level="2">98</value>
+			<value level="3">101</value>
+			<value level="4">103</value>
+			<value level="5">105</value>
+			<value level="6">107</value>
+			<value level="7">109</value>
+		</magicLvl>
+		<operateType>A2</operateType>
+		<mpConsume>
+			<value level="1">40</value>
+			<value level="2">44</value>
+			<value level="3">48</value>
+			<value level="4">51</value>
+			<value level="5">53</value>
+			<value level="6">55</value>
+			<value level="7">57</value>
+		</mpConsume>
+		<hitTime>3500</hitTime>
+		<coolTime>370</coolTime>
+		<reuseDelay>30000</reuseDelay>
+		<effectPoint>
+			<value level="1">-1378</value>
+			<value level="2">-1383</value>
+			<value level="3">-1392</value>
+			<value level="4">-1400</value>
+			<value level="5">-1407</value>
+			<value level="6">-1414</value>
+			<value level="7">-1420</value>
+		</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<affectHeight>-100;200</affectHeight>
+		<isDebuff>true</isDebuff>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">35222</value>
+					<value level="2">38826</value>
+					<value level="3">43471</value>
+					<value level="4">45591</value>
+					<value level="5">47711</value>
+					<value level="6">49958</value>
+					<value level="7">52205</value>
+				</power>
+				<criticalChance>5</criticalChance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19558" toLevel="7" name="Flame Feather">
 		<!-- Fires the Flame of Phoenix to attack nearby enemies with $s1 Power added to P. Atk. and provoke them into attacking you for $s2. Requires a sword or blunt weapon to be equipped. Over-hit. Critical. -->
 		<icon>icon.skill19552</icon>
-		<operateType>A1</operateType>
+		<affectLimit>5-12</affectLimit>
+		<affectRange>400</affectRange>
+		<lvlBonusRate>2</lvlBonusRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">95</value>
+			<value level="2">98</value>
+			<value level="3">101</value>
+			<value level="4">103</value>
+			<value level="5">105</value>
+			<value level="6">107</value>
+			<value level="7">109</value>
+		</magicLvl>
+		<operateType>A2</operateType>
+		<mpConsume>
+			<value level="1">40</value>
+			<value level="2">44</value>
+			<value level="3">48</value>
+			<value level="4">51</value>
+			<value level="5">53</value>
+			<value level="6">55</value>
+			<value level="7">57</value>
+		</mpConsume>
+		<hitTime>3500</hitTime>
+		<coolTime>370</coolTime>
+		<reuseDelay>30000</reuseDelay>
+		<effectPoint>
+			<value level="1">-1378</value>
+			<value level="2">-1383</value>
+			<value level="3">-1392</value>
+			<value level="4">-1400</value>
+			<value level="5">-1407</value>
+			<value level="6">-1414</value>
+			<value level="7">-1420</value>
+		</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<affectHeight>-100;200</affectHeight>
+		<isDebuff>true</isDebuff>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<abnormalTime>5</abnormalTime>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">35222</value>
+					<value level="2">38826</value>
+					<value level="3">43471</value>
+					<value level="4">45591</value>
+					<value level="5">47711</value>
+					<value level="6">49958</value>
+					<value level="7">52205</value>
+				</power>
+				<overHit>true</overHit>
+				<criticalChance>5</criticalChance>
+			</effect>
+			<effect name="AddHate">
+				<power>500</power>
+			</effect>
+			<effect name="TargetMe" />
+			<effect name="GetAgro" />
+		</effects>
 	</skill>
 	<skill id="19559" toLevel="11" name="Black Thorn Chain Strike">
 		<!-- Swings the Black Thorn Chain to attack the target and enemies on the path with $s1 Power added to P. Atk. and draw them to you. Also recovers your HP by $s2. Requires a sword/ blunt weapon to be equipped. -->
 		<icon>icon.skill19557</icon>
+		<affectLimit>5-12</affectLimit>
+		<abnormalTime>1</abnormalTime>
+		<abnormalLvl>1</abnormalLvl>
+		<activateRate>60</activateRate>
+		<nextAction>ATTACK</nextAction>
+		<affectRange>600</affectRange>
+		<affectLimit>10-10</affectLimit>
+		<basicProperty>NONE</basicProperty>
+		<effectPoint>
+			<value level="1">-4312</value>
+			<value level="2">-4427</value>
+			<value level="3">-4544</value>
+			<value level="4">-4661</value>
+			<value level="5">-4778</value>
+			<value level="6">-4895</value>
+			<value level="7">-5013</value>
+			<value level="8">-5013</value>
+			<value level="9">-5013</value>
+			<value level="10">-5013</value>
+			<value level="11">-5013</value>
+		</effectPoint>
+		<effectRange>600</effectRange>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">89</value>
+			<value level="2">91</value>
+			<value level="3">93</value>
+			<value level="4">95</value>
+			<value level="5">97</value>
+			<value level="6">99</value>
+			<value level="7">101</value>
+			<value level="8">103</value>
+			<value level="9">105</value>
+			<value level="10">107</value>
+			<value level="11">109</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">40</value>
+			<value level="2">44</value>
+			<value level="3">48</value>
+			<value level="4">51</value>
+			<value level="5">53</value>
+			<value level="6">55</value>
+			<value level="7">57</value>
+			<value level="8">57</value>
+			<value level="9">57</value>
+			<value level="10">57</value>
+			<value level="11">57</value>
+		</mpConsume>
 		<operateType>A1</operateType>
+		<reuseDelay>45000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>FAN</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<fanRange>0;0;600;180</fanRange>
+		<castRange>600</castRange>
+		<hitTime>3000</hitTime>
+		<coolTime>500</coolTime>
+		<reuseDelay>60000</reuseDelay>
+		<isDebuff>true</isDebuff>
+		<basicProperty>MAGIC</basicProperty> <!-- Guessed -->
+		<attributeType>DARK</attributeType>
+		<attributeValue>20</attributeValue>
+		<lvlBonusRate>1</lvlBonusRate>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BLUNT</item>
+					<item>SWORD</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">10833</value>
+					<value level="2">11492</value>
+					<value level="3">12150</value>
+					<value level="4">12809</value>
+					<value level="5">13468</value>
+					<value level="6">14126</value>
+					<value level="7">14897</value>
+					<value level="8">15623</value>
+					<value level="9">16349</value>
+					<value level="10">17119</value>
+					<value level="11">17889</value>
+				</power>
+				<overHit>true</overHit>
+				<chance>90</chance>
+			</effect>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+		</effects>
+		<selfEffects>
+			<effect name="HealPercent">
+				<power>10</power>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19560" toLevel="9" name="Rising Tide Circle">
 		<!-- Creates a circular wave to draw enemies close and decrease Atk. Spd./ Casting Spd. by $s1 and Speed by $s2. Requires a sword/ blunt weapon to be equipped. -->
 		<icon>icon.skill19558</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">1</value>
+			<value level="3">1</value>
+			<value level="4">2</value>
+			<value level="5">2</value>
+			<value level="6">3</value>
+			<value level="7">3</value>
+			<value level="8">4</value>
+			<value level="9">4</value>
+		</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>ALL_SPEED_DOWN</abnormalType>
+		<activateRate>80</activateRate>
+		<affectLimit>6-12</affectLimit>
+		<affectRange>150</affectRange>
+		<basicProperty>MAGIC</basicProperty>
+		<effectPoint>
+			<value level="1">-523</value>
+			<value level="2">-549</value>
+			<value level="3">-566</value>
+			<value level="4">-582</value>
+			<value level="5">-597</value>
+			<value level="6">-611</value>
+			<value level="7">-624</value>
+			<value level="8">-635</value>
+			<value level="9">-646</value>
+		</effectPoint>
+		<hitTime>1500</hitTime>
+		<isDebuff>true</isDebuff>
+		<lvlBonusRate>20</lvlBonusRate>
+		<magicLvl>
+			<value level="1">55</value>
+			<value level="2">58</value>
+			<value level="3">60</value>
+			<value level="4">62</value>
+			<value level="5">64</value>
+			<value level="6">66</value>
+			<value level="7">68</value>
+			<value level="8">70</value>
+			<value level="9">72</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">78</value>
+			<value level="2">84</value>
+			<value level="3">87</value>
+			<value level="4">90</value>
+			<value level="5">93</value>
+			<value level="6">96</value>
+			<value level="7">99</value>
+			<value level="8">102</value>
+			<value level="9">105</value>
+		</mpConsume>
+		<operateType>A2</operateType>
+		<reuseDelay>15000</reuseDelay>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BLUNT</item>
+					<item>SWORD</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Speed">
+				<amount>80</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>
+					<value level="1">-72</value>
+					<value level="2">-72</value>
+					<value level="3">-74</value>
+					<value level="4">-74</value>
+					<value level="5">-76</value>
+					<value level="6">-76</value>
+					<value level="7">-78</value>
+					<value level="8">-78</value>
+					<value level="9">-80</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>
+					<value level="1">-72</value>
+					<value level="2">-72</value>
+					<value level="3">-74</value>
+					<value level="4">-74</value>
+					<value level="5">-76</value>
+					<value level="6">-76</value>
+					<value level="7">-78</value>
+					<value level="8">-78</value>
+					<value level="9">-80</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19561" toLevel="11" name="Chained Death Scythe">
-		<!-- Summons a scythe to attack the target and nearby enemies with $s1 Power added to P. Atk. and draw them to you. Requires a sword/ blunt weapon to be equipped. -->
+		<!-- Summons a scythe to attack the target and nearby enemies with 17889 Power added to P. Atk. and draw them to you. Requires a sword/ blunt weapon to be equipped. -->
 		<icon>icon.skill19559</icon>
-		<operateType>A1</operateType>
+		<affectLimit>5-12</affectLimit>
+		<affectRange>200</affectRange>
+		<lvlBonusRate>2</lvlBonusRate>
+		<basicProperty>PHYSICAL</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<trait>PULL</trait>
+		<isDebuff>true</isDebuff>
+		<magicLvl>
+			<value level="1">89</value>
+			<value level="2">91</value>
+			<value level="3">93</value>
+			<value level="4">95</value>
+			<value level="5">97</value>
+			<value level="6">99</value>
+			<value level="7">101</value>
+			<value level="8">103</value>
+			<value level="9">105</value>
+			<value level="10">107</value>
+			<value level="11">109</value>
+		</magicLvl>
+		<operateType>A2</operateType>
+		<mpConsume>
+			<value level="1">166</value>
+			<value level="2">173</value>
+			<value level="3">179</value>
+			<value level="4">185</value>
+			<value level="5">191</value>
+			<value level="6">197</value>
+			<value level="7">199</value>
+			<value level="8">201</value>
+			<value level="9">203</value>
+			<value level="10">205</value>
+			<value level="11">207</value>
+		</mpConsume>
+		<hitTime>3500</hitTime>
+		<coolTime>370</coolTime>
+		<reuseDelay>30000</reuseDelay>
+		<effectPoint>
+			<value level="1">-1378</value>
+			<value level="2">-1383</value>
+			<value level="3">-1392</value>
+			<value level="4">-1400</value>
+			<value level="5">-1407</value>
+			<value level="6">-1414</value>
+			<value level="7">-1420</value>
+			<value level="8">-1425</value>
+			<value level="9">-1430</value>
+			<value level="10">-1435</value>
+			<value level="11">-1440</value>
+		</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<affectHeight>-100;200</affectHeight>
+		<isDebuff>true</isDebuff>
+		<targetType>SELF</targetType>
+		<affectScope>POINT_BLANK</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>SWORD</item>
+					<item>BLUNT</item>
+				</weaponType>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="PullBack">
+				<speed>600</speed>
+			</effect>
+			<effect name="PhysicalAttack">
+				<power>
+					<value level="1">10833</value>
+					<value level="2">11492</value>
+					<value level="3">12150</value>
+					<value level="4">12809</value>
+					<value level="5">13468</value>
+					<value level="6">14126</value>
+					<value level="7">14897</value>
+					<value level="8">15623</value>
+					<value level="9">16349</value>
+					<value level="10">17119</value>
+					<value level="11">17889</value>
+				</power>
+				<criticalChance>5</criticalChance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19562" toLevel="7" name="Reborn from Ashes">
 		<!-- Becomes invincible for $s1 and recovers $s2 HP under the Protection of Phoenix. -->
 		<icon>icon.skill19565</icon>
-		<operateType>A1</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>5</abnormalTime>
+		<abnormalType>ABNORMAL_INVINCIBILITY</abnormalType>
+		<abnormalVisualEffect>ULTIMATE_DEFENCE</abnormalVisualEffect>
+		<canCastWhileDisabled>true</canCastWhileDisabled>
+		<operateType>A2</operateType>
+		<magicLvl>97</magicLvl>
+		<mpConsume>73</mpConsume>
+		<hitTime>500</hitTime>
+		<coolTime>200</coolTime>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<reuseDelay>300000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DamageBlock">
+				<type>BLOCK_HP</type>
+			</effect>
+			<effect name="DebuffBlock" />
+			<effect name="HealPercent">
+				<power>
+					<value level="1">20</value>
+					<value level="2">35</value>
+					<value level="3">50</value>
+					<value level="4">65</value>
+					<value level="5">80</value>
+					<value level="6">90</value>
+					<value level="7">100</value>
+				</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19563" toLevel="1" name="Wave Reflection">
 		<!-- Damage Reflection Trigger -->
 		<icon>icon.skill3584</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<abnormalTime>10</abnormalTime>
+		<abnormalLvl>1</abnormalLvl>
+		<effects>
+			<effect name="DamageShield">
+				<amount>50</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19564" toLevel="1" name="Wave Barrier">
 		<!-- For $s1, P. Def. +$s2 and reflects damage when hit. Cannot be applied together with any Shield Block skill. -->
@@ -986,21 +1761,31 @@
 		<operateType>A2</operateType>
 		<hitTime>1000</hitTime>
 		<effectPoint>379</effectPoint>
-		<abnormalType>DMG_SHIELD</abnormalType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>85</magicLvl>
-		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
 		<isMagic>1</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<reuseDelay>60000</reuseDelay>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>10</abnormalTime>
+		<abnormalType>DMG_SHIELD</abnormalType>
 		<effects>
+			<effect name="TriggerSkillByDamage">
+				<attackerType>Creature</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>127</maxAttackerLevel>
+				<chance>30</chance>
+				<targetType>SELF</targetType>
+				<minDamage>1</minDamage>
+				<allowWeapons>SWORD,BLUNT</allowWeapons>
+				<skillId>19563</skillId> <!-- Wave Reflection -->
+				<skillLevel>1</skillLevel>
+			</effect>
 			<effect name="PhysicalDefence">
 				<amount>50</amount>
-			</effect>
-			<effect name="DamageShield">
-				<amount>50</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -1038,6 +1823,17 @@
 		</magicLvl>
 		<mpConsume>8</mpConsume>
 		<effects>
+		<effect name="TriggerSkillByDamage">
+				<attackerType>Creature</attackerType>
+				<minAttackerLevel>1</minAttackerLevel>
+				<maxAttackerLevel>127</maxAttackerLevel>
+				<chance>30</chance>
+				<targetType>SELFT</targetType>
+				<minDamage>1</minDamage>
+				<allowWeapons>ALL</allowWeapons>
+				<skillId>19572</skillId> <!-- Shillien Shadow -->
+				<skillLevel>1</skillLevel>
+			</effect>
 			<effect name="TriggerSkillByDamage">
 				<attackerType>Creature</attackerType>
 				<minAttackerLevel>1</minAttackerLevel>
@@ -1373,21 +2169,95 @@
 		<!-- Deactivates the Raise Shield/ Focus Shield if a shield skill is cast. -->
 		<icon>icon.skill10073</icon>
 		<operateType>A1</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DisableSkill">
+				<disable>10020;10021</disable>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19571" toLevel="1" name="Lightning Strike">
 		<!-- Paralyzed by Vanishing Shock for $s1. -->
 		<icon>icon.skill0279</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>5</abnormalTime>
+		<abnormalType>PARALYZE</abnormalType>
+		<abnormalVisualEffect>PARALYZE</abnormalVisualEffect>
+		<activateRate>100</activateRate>
+		<basicProperty>MAGIC</basicProperty>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<trait>PARALYZE</trait>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="BlockActions" />
+		</effects>
 	</skill>
 	<skill id="19572" toLevel="1" name="Shillien Shadow">
 		<!-- Removes debuffs and limits the maximum damage received for $s1 to 6666. -->
 		<icon>icon.skill5242</icon>
 		<operateType>A1</operateType>
+		<isTriggeredSkill>true</isTriggeredSkill>
+		<abnormalTime>6</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DispelByCategory">
+				<slot>DEBUFF</slot>
+				<rate>100</rate>
+				<max>20</max>
+			</effect>
+			<effect name="GetDamageLimit">
+				<amount>6666</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19573" toLevel="9" name="Cubic Fire Bless">
 		<!-- Removes debuffs, recovering $s1 CON and increasing Debuff Resistance by $s3 for $s2. Activates the Reborn from Ashes, which recovers $s4 HP to prevent death in critical condition once for 30 min. -->
 		<icon>icon.skill19565</icon>
 		<operateType>A1</operateType>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<abnormalTime>20</abnormalTime>
+		<canCastWhileDisabled>true</canCastWhileDisabled>
+		<magicLvl>97</magicLvl>
+		<hitTime>1000</hitTime>
+		<reuseDelay></reuseDelay>
+		<effects>
+			<effect name="DispelByCategory">
+				<slot>DEBUFF</slot>
+				<rate>100</rate>
+				<max>20</max>
+			</effect>
+			<effect name="Hp">
+				<amount>
+					<value level="1">2000</value>
+					<value level="2">2600</value>
+					<value level="3">3200</value>
+					<value level="4">3800</value>
+					<value level="5">4400</value>
+					<value level="6">5000</value>
+					<value level="7">6000</value>
+					<value level="8">7000</value>
+					<value level="9">8000</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="ResistDispelByCategory">
+				<amount>-60</amount>
+				<slot>BUFF</slot>
+			</effect>
+			<effect name="ResistAbnormalByCategory">
+				<amount>-60</amount>
+				<slot>DEBUFF</slot>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>19562</skillId> <!-- Reborn from Ashes -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19574" toLevel="1" name="Shield Grab Stance">
 		<!-- If this stance is reused in the two-hand stance or if the shield is equipped or unequipped, the two-hand stance effect will disappear. It is set as unequip_skill for all shield items. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml
index ca3001854d..1e5edd59be 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml
@@ -101,6 +101,17 @@
 				<affectType>CASTER</affectType>
 			</condition>
 		</conditions>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="23306" toLevel="1" name="Zinyanzi Agathion Cute Trick">
 		<!-- Able to see the summoned Zinyanzi perform cute tricks. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
index 8cc96b4d94..bcd2c2fdf5 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/35100-35199.xml
@@ -1965,7 +1965,7 @@
 		<abnormalLevel>1</abnormalLevel>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
-		<reuseDelay>180000</reuseDelay>
+		<reuseDelay>900000</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -2065,7 +2065,7 @@
 		</abnormalTime>
 		<coolTime>300</coolTime>
 		<abnormalVisualEffect>INVINCIBILITY</abnormalVisualEffect>
-		<reuseDelay>180000</reuseDelay>
+		<reuseDelay>900000</reuseDelay>
 		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
@@ -2102,7 +2102,7 @@
 	<skill id="35190" toLevel="18" name="Dragon Rise">
 		<!-- Removes all debuffs from you and excludes you from enemy's target for $s1 -->
 		<icon>icon.skill35190</icon>
-		<operateType>A2</operateType>
+		<operateType>A1</operateType>
 		<abnormalLvl>85</abnormalLvl>
 		<abnormalTime>
 			<value fromLevel="1" toLevel="12">5</value>
@@ -2118,54 +2118,57 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
+			<effect name="CpHealPercent">
+				<power>
+					<value fromLevel="1" toLevel="6">0</value>
+					<value fromLevel="7" toLevel="9">10</value>
+					<value level="10">15</value>
+					<value level="11">15</value>
+					<value level="12">20</value>
+					<value level="13">30</value>
+					<value level="14">30</value>
+					<value level="15">30</value>
+					<value level="16">35</value>
+					<value level="17">35</value>
+					<value level="18">50</value>
+				</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>
+					<value fromLevel="1" toLevel="6">0</value>
+					<value fromLevel="7" toLevel="9">10</value>
+					<value level="10">15</value>
+					<value level="11">15</value>
+					<value level="12">20</value>
+					<value level="13">30</value>
+					<value level="14">30</value>
+					<value level="15">30</value>
+					<value level="16">35</value>
+					<value level="17">35</value>
+					<value level="18">50</value>
+				</power>
+			</effect>
+			<effect name="HealPercent">
+				<power>
+					<value fromLevel="1" toLevel="6">0</value>
+					<value fromLevel="7" toLevel="9">10</value>
+					<value level="10">15</value>
+					<value level="11">15</value>
+					<value level="12">20</value>
+					<value level="13">30</value>
+					<value level="14">30</value>
+					<value level="15">30</value>
+					<value level="16">35</value>
+					<value level="17">35</value>
+					<value level="18">50</value>
+				</power>
+			</effect>
 			<effect name="Untargetable" />
 			<effect name="DispelByCategory">
 				<slot>DEBUFF</slot>
 				<rate>100</rate>
 				<max>20</max>
 			</effect>
-			<effect name="CpHealPercent">
-				<amount>
-					<value fromLevel="7" toLevel="9">10</value>
-					<value level="10">15</value>
-					<value level="11">15</value>
-					<value level="12">20</value>
-					<value level="13">30</value>
-					<value level="14">30</value>
-					<value level="15">30</value>
-					<value level="16">35</value>
-					<value level="17">35</value>
-					<value level="18">50</value>
-				</amount>
-			</effect>
-			<effect name="ManaHealPercent">
-				<amount>
-					<value fromLevel="7" toLevel="9">10</value>
-					<value level="10">15</value>
-					<value level="11">15</value>
-					<value level="12">20</value>
-					<value level="13">30</value>
-					<value level="14">30</value>
-					<value level="15">30</value>
-					<value level="16">35</value>
-					<value level="17">35</value>
-					<value level="18">50</value>
-				</amount>
-			</effect>
-			<effect name="HealPercent">
-				<amount>
-					<value fromLevel="7" toLevel="9">10</value>
-					<value level="10">15</value>
-					<value level="11">15</value>
-					<value level="12">20</value>
-					<value level="13">30</value>
-					<value level="14">30</value>
-					<value level="15">30</value>
-					<value level="16">35</value>
-					<value level="17">35</value>
-					<value level="18">50</value>
-				</amount>
-			</effect>
 		</effects>
 	</skill>
 	<skill id="35191" toLevel="1" name="Special Ability Legend Infinity Shaper">